debian-hardened-buildflags

Gbp-Pq: Name debian-hardened-buildflags.diff

diff --git a/config_host.mk.in b/config_host.mk.in
index 1ba5aa9ba63752893fc4e1b32d41a534e266aa69..e7f7cf3c0d4c40eff2317f3919faf3300c22b0ff 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,6 +62,10 @@ export CPPUNIT_LIBS=@CPPUNIT_LIBS@
 export CPU=@CPU@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CFLAGS=@HARDEN_CFLAGS@
+export HARDEN_CXXFLAGS=@HARDEN_CXXFLAGS@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
+export HARDEN_LDFLAGS=@HARDEN_LDFLAGS@
 export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
 export CPU_FOR_BUILD=@CPU_FOR_BUILD@
 export CROSS_COMPILING=@CROSS_COMPILING@

diff --git a/configure.in b/configure.in
index 22c8d52a1d15e17e4b017afa2a90c72fc0cdfa04..6069c884bac9bfc03e78c3cb7a16c6c98c5bdc14 100644 (file)
Binary files a/configure.in and b/configure.in differ

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4185a03ed47df29f4767acc0cb23c4194ab7230..bddc0286e5ea387d2b64e23fd28ae8c59365ddf4 100644 (file)
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -54,6 +54,8 @@ gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget
 gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
 gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
 
+LDFLAGS += $(HARDEN_LDFLAGS)
+
 # Overview of dependencies and tasks of LinkTarget
 #
 # target                      task                         depends on

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a787e145db899e8219297a6515b07e532c7e1e21..6580ba6d99d6bb36ecc259a0a48297449f93ce5a 100644 (file)
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -142,6 +142,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
 gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
 endif
 
+gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
+gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
+
 include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
@@ -268,6 +271,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 include $(GBUILDDIR)/Deliver.mk

diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 02884fa120ccaf70e51af2d70659198ee8c6c687..be62657f44b7591ade64b911940d771af15f0515 100644 (file)
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -264,6 +264,10 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
+LINKFLAGS += $(HARDEN_LDFLAGS)
+CDEFS += $(HARDEN_CPPFLAGS)
+CFLAGS += $(HARDEN_CFLAGS)
+
 # libraries for linking applications
 STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
 STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed